If myself and another developer are working on the...
# how-do-ib
Ben Payne
12/12/2025, 7:02 PMIf myself and another developer are working on the same branch and we make changes to same line...in a normal git workflow, I would do a pull before pushing. This would then show me exactly where there is a merge conflict. In Graphite i'm given the option to update my local, or the remote or to cancel and reconcile the difference manually....but I don't see where Graphite tells me what needs to be reconciled. Am I just missing a step?
p
Pylon
12/12/2025, 7:02 PM(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about:
- Screenshots / debug logs / list of commands you've tried to run so far
- Your workflow
- Current state
b
Ben Payne
12/12/2025, 7:04 PMSteps to reproduce:
Ben Payne
12/12/2025, 7:06 PM1. Dev A makes change to line 1
2. Dev B makes change to line 1
3. Dev A commits and pushes
4. Dev B commits and pushes
5. Gets note from Graphite indicating the branches are out of sync and to run
gt getgt syncgt getp
Pylon
12/12/2025, 8:02 PMHey Ben, this is a gap in
gtb
Ben Payne
12/15/2025, 3:21 PMHey Brett - Ok...I think I figured that out. Basically from step 5 on correct? Something like:
1.
git pull origin <branch>gt modify --all -mgt submitp
Pylon
12/15/2025, 3:26 PMyeap!
b
Ben Payne
12/15/2025, 4:15 PMOk. Anything in the works to address that gap?
Ben Payne
12/15/2025, 4:16 PMOnly reason I ask is because this is one of those items that prevents my team from using Graphite for collaborating on a project.
p
Pylon
12/15/2025, 4:18 PMI havent seen anything specifically but the CLI team continues to expand and improve the functionality so could be in the near future
b
Ben Payne
12/15/2025, 4:19 PMOk
Ben Payne
12/15/2025, 4:19 PMThanks