[git-users] Re: conflicts in pull requests

2014-10-09 Thread Pierre-François CLEMENT
On Tuesday, 7 October 2014 11:32:53 UTC+2, likage wrote: > > Hi Pierre, thanks for getting back to me. > > Then doesn't that simply means that I may have to do the merging from > master into develop, every now and then? > You can do this from time to time, to make sure develop stays in sync with

[git-users] Re: conflicts in pull requests

2014-10-08 Thread likage
Hi Pierre, thanks for getting back to me. Then doesn't that simply means that I may have to do the merging from master into develop, every now and then? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and

[git-users] Re: conflicts in pull requests

2014-10-02 Thread Pierre-François CLEMENT
On Tuesday, 30 September 2014 04:56:40 UTC+2, likage wrote: > > Hi all, I have just started out using Git and I have a couple of > questions. Bear with me should the questions sound ridiculous or stupid > even... > > Say, in this repo of mine, there are 3 branches - master (main) and > develop b