Don’t forget you need to pull into dev first. Best thing to do, probably: git checkout dev git pull origin dev git checkout sydb-occurs git merge dev You could short-circuit that process by just doing git pull origin dev in your branch, but then you wouldn’t have a local, up-to-date dev branch, so you’d still have to pull it later.
On Nov 7, 2016, at 2:33 , Elisa Beshero-Bondar <ebbondar@gmail.com> wrote:
Oops! Just re-read your message and realized you were asking the opposite: How to merge the changes from dev into your sydb-occurs branch? So, my answer is really just the opposite:
git checkout sydb-occurs git merge dev
I was just reading about merging vs. rebasing here: https://www.atlassian.com/git/tutorials/merging-vs-rebasing <https://www.atlassian.com/git/tutorials/merging-vs-rebasing><https://www.atlassian.com/git/tutorials/merging-vs-rebasing <https://www.atlassian.com/git/tutorials/merging-vs-rebasing>> and I’m pretty sure you want merge rather than rebase, but take a look.
Elisa -- Elisa Beshero-Bondar, PhD Director, Center for the Digital Text | Associate Professor of English University of Pittsburgh at Greensburg | Humanities Division 150 Finoli Drive Greensburg, PA 15601 USA E-mail: ebb8@pitt.edu <mailto:ebb8@pitt.edu> <mailto:ebb8@pitt.edu <mailto:ebb8@pitt.edu>> Development site: http://newtfire.org <http://newtfire.org/> <http://newtfire.org/ <http://newtfire.org/>>
On Nov 7, 2016, at 2:27 AM, Elisa Beshero-Bondar <ebbondar@gmail.com <mailto:ebbondar@gmail.com>> wrote:
Hi Syd: Here’s how to merge your branch into dev: You need to switch over to the dev branch from your sydb-occurs branch with git checkout dev
then merge with: git merge sydb-occurs
I just had to look this up for one of my projects—timely. :-)
Elisa
-- Elisa Beshero-Bondar, PhD Director, Center for the Digital Text | Associate Professor of English University of Pittsburgh at Greensburg | Humanities Division 150 Finoli Drive Greensburg, PA 15601 USA E-mail: ebb8@pitt.edu <mailto:ebb8@pitt.edu> Development site: http://newtfire.org <http://newtfire.org/>
On Nov 6, 2016, at 9:01 PM, Syd Bauman <s.bauman@northeastern.edu <mailto:s.bauman@northeastern.edu> <mailto:s.bauman@northeastern.edu <mailto:s.bauman@northeastern.edu>>> wrote:
So I've let the branch I'm using to work on the @minOccurs @maxOccurs bug lay fallow for a bit too long now. I'd like to merge the changes that have been made to the 'dev' branch since I created the 'sydb-occurs' branch into that branch. Can someone remind me how to do that?
Thanks. -- tei-council mailing list tei-council@lists.tei-c.org <mailto:tei-council@lists.tei-c.org> <mailto:tei-council@lists.tei-c.org <mailto:tei-council@lists.tei-c.org>> http://lists.lists.tei-c.org/mailman/listinfo/tei-council <http://lists.lists.tei-c.org/mailman/listinfo/tei-council>
PLEASE NOTE: postings to this list are publicly archived
-- tei-council mailing list tei-council@lists.tei-c.org <mailto:tei-council@lists.tei-c.org> http://lists.lists.tei-c.org/mailman/listinfo/tei-council <http://lists.lists.tei-c.org/mailman/listinfo/tei-council>
PLEASE NOTE: postings to this list are publicly archived