How-to merge conflicts with TortoiseGit

Aug 24, 2012 at 10:05 PM

Is this workflow reasonable?

1. Each dev has their own git repo and pulls from TFS. All work is done on master. 

2. Commit any working directory changes

3. git tf pull --rebase

4. TortoiseGit -> Resolve...

- use tortoise' merge tool on each file

- tortoise recommends you commit but warns about detached head

- tell tortoise to commit but don't create a new branch

5. git rebase --continue

6. git tf checkin

 

Thanks,

Brian

Developer
Aug 24, 2012 at 10:15 PM

Hello Brian,

Yes this workflow is reasonable, this is actually very close to how we work here on the project in Microsoft. The only difference is that some of us use git tf pull --rebase , while others prefer git tf pull.

Another thing to note is that if one of the developers want to have richer rebase experience beyond the options that git tf pull provides you can replace "git tf pull --rebase" with

git tf fetch

git rebase FETCH_HEAD master

Please let us know if you hit any issues or if you have any feedback.

Thanks,

Youhana

Aug 24, 2012 at 11:26 PM

Great. Thanks!