On Aug 23, 2:09 am, Konstantin Khomoutov
wrote:
> On Mon, 22 Aug 2011 05:14:29 -0700 (PDT)
>
> Sandeep Mahajan wrote:
>
> [...]
>
>
>
>
>
>
>
>
>
> > > > 1. Assume I have a central repo containing branches branchA.
> > > > 2. This repo is cloned by user A and userB.
> > > > 3. userA creates a n
Thank you everyone. I will keep doing the same. I tried rebasing and had a
few issues (merge conflicts!).
Mark
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To view this discussion on the web visit
https://groups.google.com/d/msg/gi
On Mon, 22 Aug 2011 05:14:29 -0700 (PDT)
Sandeep Mahajan wrote:
[...]
> > > 1. Assume I have a central repo containing branches branchA.
> > > 2. This repo is cloned by user A and userB.
> > > 3. userA creates a new branchB where he merges in branchA.
> > > 4. There is a conflict reported, and on
I would stick to having merge commits, because they more fully capture the
work that took place.
On Sun, Aug 21, 2011 at 10:41 PM, PJ Weisberg wrote:
> There's nothing necessarily wrong with merge commits, but if you want to
> straighten out your history before you push:
>
> $ git fetch origin
>
Thanks.
Lets extrapolate on this and make it a bit more complicated.
1. I have a central repo containing branch1 and branch2
2. branch1 and 2 have 3 files - file1, file2 and file3
3. This repo is cloned by userA, userB, userC- each user owning file1,
file2 and file3 respectively
4. Assume the thr
On Mon, 22 Aug 2011 04:18:58 -0700 (PDT)
Sandeep Mahajan wrote:
> 1. Assume I have a central repo containing branches branchA.
> 2. This repo is cloned by user A and userB.
> 3. userA creates a new branchB where he merges in branchA.
> 4. There is a conflict reported, and only userB has the skill
Hi,
1. Assume I have a central repo containing branches branchA.
2. This repo is cloned by user A and userB.
3. userA creates a new branchB where he merges in branchA.
4. There is a conflict reported, and only userB has the skills to
resolve the conflict.
Question: How can userB view the same conf
On Sun, 21 Aug 2011 13:39:35 -0700 (PDT)
Mark Liversedge wrote:
> Dumb question. I'm working on a branch locally that is also over at
> github. I fetch the latest from github with:
[...]
> But when I pull other folks commits I get a merge commit and that
> gets pushed up to github.
>
> I've come
