Hi,
Sorry to disturb the list with this, but I'm pure newbee in git and despite my
googleling, I'm unable to understand how to merge back all my changes.
I've setup my git like this:
$ git config --global user.email "my email"
$ git config --global user.name "my login"
$ git config --global core.autocrlf input
$ git config --global core.safecrlf true
$ git clone https://github.com/finley/SystemImager.git
Then I did commit my changes, and now I'd like to merge, what should I do to
merge back my fixes? I've tryed the following with no success:
$ git merge master
Already up-to-date.
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 15 commits.
#
nothing to commit (working directory clean)
My current git is clean and doing make source_tarball and rpmbuild -tb
rpm/systemiamger-4.3.0.tar.bz2 produces correct rpm with all my fixes including
my last bugfix.
Many thanks for your help.
Regards,
Olivier.
--
Olivier LAHAYE
CEA DRT/LIST/DCSI/DIR
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412
_______________________________________________
sisuite-devel mailing list
sisuite-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sisuite-devel
