[Lazarus] Lazarus project and git workflow

[Václav Valíček]

Hi,
it's normal to solve merge/rebase conflicts by hand... Sometimes, git is 
able to solve changes, if each of you edits another part of form 
(another part of lfm diffs). In other cases, you are forced to use 3 way 
merging, best with some GUI tool. For me, it was best to set mergetool 
in .gitconfig and then git opens editor for each file (afrer git 
mergetool command). If you use meld, I can suggest --auto-merge (or 
--auto-compare - not sure). It is perfect timesaver.

Václav Valíček
vaclav at valicek.name

Dne 26.6.2014 15:03, Petr Hlozek napsal(a):
> Hi,
>
> if two or more developers work on a project, they sometimes edit the
> same form. Git can't solve the changes and you have to do it by hand.
> Even it's better to use the form the other developer and add the
> changes again by hand. It's impossible to solve the conflict.
>
> What do you do when you have this problem?
>
> Thank you for you time!
>
> Petr
>
> --
> _______________________________________________
> Lazarus mailing list
> Lazarus at lists.lazarus.freepascal.org
> http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus