On Thu, Jan 9, 2020 at 3:35 PM Gerben Wierda wrote:
> Given my absolute lack of decent git skills (and it’s just too complicated
> for a fast skill increase) I have the following setup (which so far worked)
>
I'll add my 2 cents and echo that you should keep master pristine. I would
even suggest
On Tue, Jan 14, 2020 at 09:04:41AM -0500, Steven Smith wrote:
> > "reset" is not a git command I ever run in the normal course of my
> > contributions to MacPorts
>
> Practically, the most efficient way to fix conflicts or really any
> git local error is to save work outside git, do a `git reset
> "reset" is not a git command I ever run in the normal course of my
> contributions to MacPorts
Practically, the most efficient way to fix conflicts or really any git local
error is to save work outside git, do a `git reset --hard upstream/master`, and
copy the work back.
This is also true fo
On Jan 10, 2020, at 03:34, Gerben Wierda wrote:
> If I produce a pull request and I’m rebuffed because of an error I make, I
> need to go back to testate of the official repository before proceeding again.
I think you should reexamine how you are using git, because "reset" is not a
git comma
Gerben Wierda writes:
> If I produce a pull request and I’m rebuffed because of an error I make, I
> need to go back to
> testate of the official repository before proceeding again. At such a point
> my own clone is both
> commits ahead and commits behind the official repository. I need to lose
There’s always an xkcd.
Don’t forget to read the hover text:
> If that doesn't fix it, git.txt contains the phone number of a friend of mine
> who understands git. Just wait through a few minutes of 'It's really pretty
> simple, just think of branches as...' and eventually you'll learn the
> c
> On 10 Jan 2020, at 9:34 am, Gerben Wierda wrote:
>
> OK. I'm back in git hell (suggestions made on this list, tips on
> stackexchange, git documentation, nothing gives me the answer)
>
> I have
> albus:macports-ports sysbh$ git remote -v
> local https://github.com/gctwnl/macports-ports.git
On Thu, Jan 09, 2020 at 11:57:56PM -0800, Michael wrote:
> On 2020-01-09, at 2:33 PM, Steven Smith <[1]steve.t.sm...@gmail.com>
> wrote:
>
>> Me too. We’re discussing MacPorts-relevant git commands
>> in [2]https://github.com/macports/macports-ports/pull/6106 .
>> Easiest, most destructive to loc
This actually completed, but on GitHub.com I still see:
This branch is 2 commits ahead, 343 commits behind macports:master.
In other words, any pull request will still be denied because it consists of
multiple commits on a part instead of a single one.
I understand that MacPorts wants to keep t
OK. I'm back in git hell (suggestions made on this list, tips on stackexchange,
git documentation, nothing gives me the answer)
I have
albus:macports-ports sysbh$ git remote -v
local https://github.com/gctwnl/macports-ports.git (fetch)
local https://github.com/gctwnl/macports-ports.git (push
That's about it!
K
On 2020-01-09, at 2:33 PM, Steven Smith wrote:
> Me too. We’re discussing MacPorts-relevant git commands in
> https://github.com/macports/macports-ports/pull/6106 .
>
> Easiest, most destructive to local:
>
> # save all local files changed outside the git repo
>
> git fetch --all
> git reset
Me too. We’re discussing MacPorts-relevant git commands in
https://github.com/macports/macports-ports/pull/6106 .
Easiest, most destructive to local:
# save all local files changed outside the git repo
git fetch --all
git reset --hard upstream/master
# restore all local files
> On Jan 9, 20
If anyone else pushed between your fetch and push, you'll be out of date
again.
Not entirely sure what your workflow is, but you a current git should
let you do an autostash on pull (which might help your situation):
git pull --rebase --autostash && git push
On 1/9/20 4:34 PM, Gerben Wierd
14 matches
Mail list logo
