Re: Stop [was: Presentation and S.O.S]
Posted by PatGuano on Nov 03, 2011; 6:37pm
URL: https://forum.librecad.org/Presentation-and-S-O-S-tp4952926p4961937.html
Howdy,
here are the results:
------
michael@drusus:~/prog$ cd LibreCAD/
michael@drusus:~/prog/LibreCAD$ git checkout -f -b LibreCAD_branch
origin/master
Branch LibreCAD_branch set up to track remote branch master from origin.
Switched to a new branch 'LibreCAD_branch'
michael@drusus:~/prog/LibreCAD$ git merge master
Updating 8c84efe..6146542
Fast-forward
src/actions/rs_actiondrawimage.cpp | 2 ++
src/lib/engine/rs_entitycontainer.cpp | 6 +++---
src/lib/engine/rs_graphic.cpp | 7 +++----
src/lib/engine/rs_graphic.h | 1 +
src/lib/filters/rs_filterjww.cpp | 4 +++-
src/lib/gui/rs_grid.cpp | 9 ++++++---
src/ui/qg_pentoolbar.cpp | 9 ++++++---
7 files changed, 24 insertions(+), 14 deletions(-)
michael@drusus:~/prog/LibreCAD$ git push
Enter passphrase for key '/home/michael/.ssh/id_rsa':
Counting objects: 48, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (33/33), done.
Writing objects: 100% (33/33), 3.00 KiB, done.
Total 33 (delta 27), reused 0 (delta 0)
To [hidden email]:PatGuano/LibreCAD.git
8c84efe..6146542 master -> master
------
All I need to know now is, where I see my changes and ..., okay, I see
them, when I start creating a pull request. :-/
For exercise, I will just do that, create a pull request and observe
what happens.
Sorry, I am accustomed to Subversion and even CVS and was expecting
more intense feedback from github.
Thank you anyway.
Michael.
On Thu, 3 Nov 2011 11:08:23 -0700 (PDT)
"dxli [via LibreCAD]" <[hidden email]> wrote:
>
>
> Hi,
>
> Let's do step by step.
>
> in your repository folder,
>
> $ git branch -a
>
> you should see something like,
>
> remotes/origin/master
>
> if so, checkout it to another branch:
>
> $ git checkout -f -b new-branch origin/master
>
> it should checkout the master branch (at your remote pository) to a
> branch named "new-branch".
>
> Then, merge your changes to this new branch:
>
> $ git merge master
>
> it should merge your changes. if it says, "already up-to-date", that
> means you have not committed anything yet to your master branch.
>
> $ git push
>
> it should push your changes to the remote repository.
>
> Let me know whether it works for you.
>
> Thanks,
>
> Dongxu Li
>
> On Thu, Nov 3, 2011 at 1:04 PM, PatGuano [via LibreCAD] <
> [hidden email]> wrote:
>
> > So, I re-created my account and can fork (as before), clone (as
> > before), fetch upstream (new) and commit changes (new).
> >
> > Only, my changes have not shown up anywhere during the last two
> > days, when I access my github-repository either on the web, or by
> > calling git in a terminal. For now, I have decided to concentrate
> > on other duties and do some reading-work on other subjects. I can
> > wait.
> >
> > Cheerio.
> > I think a person's worth is measured by nature, in her own terms,
> > not by joining a clique of mutual praise with no connection to
> > reality. (Paul Lutus <http://www.arachnoid.com>)
> >
> >
> > ------------------------------
> > If you reply to this email, your message will be added to the
> > discussion below:
> >
> > http://librecad.1049103.n5.nabble.com/Presentation-and-S-O-S-tp4952926p4961692.html
> > To start a new topic under LibreCAD-dev, email
> > [hidden email]
> > To unsubscribe from LibreCAD-dev, click
> > here<
> >
> >
>
>
> _______________________________________________
> If you reply to this email, your message will be added to the
> discussion below:
> http://librecad.1049103.n5.nabble.com/Presentation-and-S-O-S-tp4952926p4961866.html
>
> To unsubscribe from Presentation and S.O.S, visit
>
GnuPG/OpenPGP: 2048D/74A227D5 2010-04-09 [verfällt: 2012-04-08]
sub: 2048g/4E580A13 2010-04-09 [verfällt: 2012-04-08]
User: Michael Uplawski (privat) <[hidden email]>
Fingerprint: 1E6E 87CF B2F5 EBBC ACB6 7120 0A44 0972 74A2 27D5
URL: https://forum.librecad.org/Presentation-and-S-O-S-tp4952926p4961937.html
Howdy,
here are the results:
------
michael@drusus:~/prog$ cd LibreCAD/
michael@drusus:~/prog/LibreCAD$ git checkout -f -b LibreCAD_branch
origin/master
Branch LibreCAD_branch set up to track remote branch master from origin.
Switched to a new branch 'LibreCAD_branch'
michael@drusus:~/prog/LibreCAD$ git merge master
Updating 8c84efe..6146542
Fast-forward
src/actions/rs_actiondrawimage.cpp | 2 ++
src/lib/engine/rs_entitycontainer.cpp | 6 +++---
src/lib/engine/rs_graphic.cpp | 7 +++----
src/lib/engine/rs_graphic.h | 1 +
src/lib/filters/rs_filterjww.cpp | 4 +++-
src/lib/gui/rs_grid.cpp | 9 ++++++---
src/ui/qg_pentoolbar.cpp | 9 ++++++---
7 files changed, 24 insertions(+), 14 deletions(-)
michael@drusus:~/prog/LibreCAD$ git push
Enter passphrase for key '/home/michael/.ssh/id_rsa':
Counting objects: 48, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (33/33), done.
Writing objects: 100% (33/33), 3.00 KiB, done.
Total 33 (delta 27), reused 0 (delta 0)
To [hidden email]:PatGuano/LibreCAD.git
8c84efe..6146542 master -> master
------
All I need to know now is, where I see my changes and ..., okay, I see
them, when I start creating a pull request. :-/
For exercise, I will just do that, create a pull request and observe
what happens.
Sorry, I am accustomed to Subversion and even CVS and was expecting
more intense feedback from github.
Thank you anyway.
Michael.
On Thu, 3 Nov 2011 11:08:23 -0700 (PDT)
"dxli [via LibreCAD]" <[hidden email]> wrote:
>
>
> Hi,
>
> Let's do step by step.
>
> in your repository folder,
>
> $ git branch -a
>
> you should see something like,
>
> remotes/origin/master
>
> if so, checkout it to another branch:
>
> $ git checkout -f -b new-branch origin/master
>
> it should checkout the master branch (at your remote pository) to a
> branch named "new-branch".
>
> Then, merge your changes to this new branch:
>
> $ git merge master
>
> it should merge your changes. if it says, "already up-to-date", that
> means you have not committed anything yet to your master branch.
>
> $ git push
>
> it should push your changes to the remote repository.
>
> Let me know whether it works for you.
>
> Thanks,
>
> Dongxu Li
>
> On Thu, Nov 3, 2011 at 1:04 PM, PatGuano [via LibreCAD] <
> [hidden email]> wrote:
>
> > So, I re-created my account and can fork (as before), clone (as
> > before), fetch upstream (new) and commit changes (new).
> >
> > Only, my changes have not shown up anywhere during the last two
> > days, when I access my github-repository either on the web, or by
> > calling git in a terminal. For now, I have decided to concentrate
> > on other duties and do some reading-work on other subjects. I can
> > wait.
> >
> > Cheerio.
> > I think a person's worth is measured by nature, in her own terms,
> > not by joining a clique of mutual praise with no connection to
> > reality. (Paul Lutus <http://www.arachnoid.com>)
> >
> >
> > ------------------------------
> > If you reply to this email, your message will be added to the
> > discussion below:
> >
> > http://librecad.1049103.n5.nabble.com/Presentation-and-S-O-S-tp4952926p4961692.html
> > To start a new topic under LibreCAD-dev, email
> > [hidden email]
> > To unsubscribe from LibreCAD-dev, click
> > here<
> >
> >
>
>
> _______________________________________________
> If you reply to this email, your message will be added to the
> discussion below:
> http://librecad.1049103.n5.nabble.com/Presentation-and-S-O-S-tp4952926p4961866.html
>
> To unsubscribe from Presentation and S.O.S, visit
>
GnuPG/OpenPGP: 2048D/74A227D5 2010-04-09 [verfällt: 2012-04-08]
sub: 2048g/4E580A13 2010-04-09 [verfällt: 2012-04-08]
User: Michael Uplawski (privat) <[hidden email]>
Fingerprint: 1E6E 87CF B2F5 EBBC ACB6 7120 0A44 0972 74A2 27D5
signature.asc (237 bytes)
I think a person's worth is measured by nature, in her own terms, not by joining a clique of mutual praise with no connection to reality. (Paul Lutus)
| Free forum by Nabble | Edit this page |