Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Corrected links that should have been relative instead of absolute.

...

[16:21:54 CST(-0600)] <pandisaurus> I'm showing 24 "upgraded" messages, but it says it found 104 files to import (104 should be accurate) is there a way to see what files its skipping and why?

[16:22:08 CST(-0600)] <EricDalquist1> is that after a failure?

[16:22:16 CST(-0600)] <pandisaurus> no I'm counting when its successful

[16:22:19 CST(-0600)] <EricDalquist1> hrm

[16:22:23 CST(-0600)] <EricDalquist1> that sounds like a bug

[16:22:35 CST(-0600)] <EricDalquist1> you should be seeing either the same numbers all the way through

[16:22:40 CST(-0600)] <EricDalquist1> or it should fail with a reason

[16:22:49 CST(-0600)] <EricDalquist1> stuff shouldn't get silently ignored

[16:23:39 CST(-0600)] <pandisaurus> hmmm, that's troublesome because it is silently ignoring. "git checkout" just updates to the most current version of the trunk right? If I'm not specifying a branch?

[16:25:16 CST(-0600)] <EricDalquist1> sorry

[16:25:40 CST(-0600)] <EricDalquist1> "git checkout branch-name" checks out the specified branch

[16:25:41 CST(-0600)] <EricDalquist1> locally

[16:25:50 CST(-0600)] <EricDalquist1> to updates to the branch you are currently on

[16:25:57 CST(-0600)] <EricDalquist1> do "git pull"

[16:26:18 CST(-0600)] <EricDalquist1> which is a shortcut for doing:

[16:26:18 CST(-0600)] <EricDalquist1> git fetch

[16:26:19 CST(-0600)] <EricDalquist1> git merge origin/current-branch-name

[16:26:34 CST(-0600)] <EricDalquist1> you can determine your current branch via "git status"

[16:26:41 CST(-0600)] <EricDalquist1> have to run though