[sakai-core-team] Git Workflow for commits

[Matthew Jones]

Okay, thanks.

Everything I saw about this looked really complicated. I often don't want
to touch upstream (yet) as it just feels "safer" working in my own
repository. I tried a rebase there but there were like 20 other commits
between this initial commit and when the conflict was resolved (even though
only a few days had passed). I know I could have amended the commit message
as that was just the default, but I guess it makes sense to just leave it.

On Tue, Feb 24, 2015 at 6:52 AM, Matthew Buckett <
matthew.buckett at it.ox.ac.uk> wrote:

> That's the safest, easiest way to resolve the conflict. It means you
> don't risk losing your work and if you mess up the merge and want to
> re-try it's easy todo.
> The only downside is the slightly messier history.
>
> One alternative is to rebase your local branch onto upstream/master.
>
> For bugfixes that are to be merged back to a stable branch it's
> generally better to have the extra commit so that if the conflicting
> commit isn't going to the stable branch only the original change gets
> merged back.
>
> On 24 February 2015 at 01:46, Matthew Jones <matthew at longsight.com> wrote:
> > So today I ran into my first PR that github wouldn't merge with the
> button.
> > Yeah, I haven't been running git long.
> >
> > So I ran a
> >
> > git fetch upstream && git merge upstream/master
> >
> > in the branch, and it said there was a commit, I fixed the commit,
> > recommitted and pushed it all back into the branch. And it committed and
> > looked okay but it added a new commit message. I don't know how to
> *squash*
> > this or do anything to it. Does it matter? Do we have a process for
> this? I
> > could close this and start again.
> >
> > Anyone have any great workflow when there's a conflict?
> >
> > https://github.com/sakaiproject/sakai/pull/204
> >
> > _______________________________________________
> > sakai-core-team mailing list
> > sakai-core-team at collab.sakaiproject.org
> > http://collab.sakaiproject.org/mailman/listinfo/sakai-core-team
> >
>
>
>
> --
>   Matthew Buckett, VLE Developer, IT Services, University of Oxford
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-core-team/attachments/20150224/86970962/attachment.html