The Lounge - CodeProject

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Sander Rossel21-Jan-16 8:56

Sander Rossel

21-Jan-16 8:56

We've been using it for at least half a year now. No improvement Sigh | :sigh:

At least I've installed TortoiseGit as it's so much better than SourceTree (I've used TortoiseSVN before Git).
For example, in SourceTree it's impossible to just have the commits of a single file (or they've really hidden that feature). It's a breeze in Tortoise.
The file compare in SourceTree is horrible (sometimes I just can't get the full "before" and "after" version of a commit), very easy and clear in Tortoise.
I'm afraid I'm past the "deep breath" part, at least as far as SourceTree is concerned.

Visit my blog at Sander's bits - Writing the code you need.
Or read my articles at my CodeProject profile.

Simplicity is prerequisite for reliability.
— Edsger W. Dijkstra

Regards,
Sander

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

snorkie21-Jan-16 9:50

snorkie

21-Jan-16 9:50

fair enough. I prefer TortoiseGit as well.

Hogan

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Slacker00721-Jan-16 9:01

Slacker007

21-Jan-16 9:01

Bit bucket + Tortoise for Git. Duh. Big Grin | :-D

I prefer Git. Just takes some time to get used to. Been using Bitbucket for almost 2 years now, with Tortoise.

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Sander Rossel21-Jan-16 9:11

Sander Rossel

21-Jan-16 9:11

Slacker007 wrote:
Tortoise for Git

Yeah, installed it today (see my reply above your post).
I've always used TortoiseSVN for years and TortoiseGit is pretty much the same.
At least it's SOOOOOOOOOOOOOOO much better than SourceTree Big Grin | :-D

Visit my blog at Sander's bits - Writing the code you need.
Or read my articles at my CodeProject profile.

Simplicity is prerequisite for reliability.
— Edsger W. Dijkstra

Regards,
Sander

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Slacker00721-Jan-16 9:27

Slacker007

21-Jan-16 9:27

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Brisingr Aerowing21-Jan-16 9:38

Brisingr Aerowing

21-Jan-16 9:38

SourceTree is a piece of [REDACTED] fecal matter. That's all that needs to be said.

What do you get when you cross a joke with a rhetorical question?

The metaphorical solid rear-end expulsions have impacted the metaphorical motorized bladed rotating air movement mechanism.

Do questions with multiple question marks annoy you???

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Sander Rossel21-Jan-16 10:30

Sander Rossel

21-Jan-16 10:30

All I needed to hear! Laugh | :laugh:

Visit my blog at Sander's bits - Writing the code you need.
Or read my articles at my CodeProject profile.

Simplicity is prerequisite for reliability.
— Edsger W. Dijkstra

Regards,
Sander

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Marc Clifton21-Jan-16 15:57

Marc Clifton

21-Jan-16 15:57

Welcome to git. git reset --hard is your friend, haha.

That, and just wiping the folder and doing a git clone again.

Personally, I find GUI tools like SmartGit/Hg to be very helpful, once I figured out (but now I don't remember) which branch to click on when I want to merge another branch in. That and figuring out how to integrate changes multiple people made to the same file. I can't believe we still use ++++ and VVVVV and ^^^^^ to designate changes, and who the hell remembers whether VVVV means my changes or your changes. F***ing archaic legacy from the Unix world. Oh wait...

Marc

Imperative to Functional Programming Succinctly

Contributors Wanted for Higher Order Programming Project!

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Sander Rossel21-Jan-16 21:24

Sander Rossel

21-Jan-16 21:24

Marc Clifton wrote:
git reset --hard is your friend, haha.

Jep

Marc Clifton wrote:
That, and just wiping the folder and doing a git clone again.

Jep

Marc Clifton wrote:
f***ing archaic legacy from the Unix world. Oh wait...

Jep

Visit my blog at Sander's bits - Writing the code you need.
Or read my articles at my CodeProject profile.

Simplicity is prerequisite for reliability.
— Edsger W. Dijkstra

Regards,
Sander

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

MarkTJohnson22-Jan-16 3:37

MarkTJohnson

22-Jan-16 3:37

GitHub app for windows isn't much better except it just does that "colleague changed a file" stuff for you without asking. The extra commit just shows up.

My new mantra has become:

Change branch
Pull
Create Commit
Pull
Sync Commit
Pull

Git is further proof that Linus doesn't like people.

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

Sander Rossel22-Jan-16 5:38

Sander Rossel

22-Jan-16 5:38

So if we all dislike it, why do we use it? Unsure | :~

Visit my blog at Sander's bits - Writing the code you need.
Or read my articles at my CodeProject profile.

Simplicity is prerequisite for reliability.
— Edsger W. Dijkstra

Regards,
Sander

Re: #$@*&#$!*^$!#P&%@ Git + SourceTree

MarkTJohnson22-Jan-16 6:25

MarkTJohnson

22-Jan-16 6:25

Are you Silver Box or Black box? Sorry, Apple or Windows (where I work all the PC's are black).

The Silver Box people love Git, the Black Box people not so much. But then Silver Box people like belonging to cults.

APOD

R. Giskard Reventlov21-Jan-16 5:18

R. Giskard Reventlov

21-Jan-16 5:18

The View Toward M101 [^]

No chickens today - even with Dan Neely's addendum I still don't see a chicken. You could just as easily play connect the dots and make it look like anything. Anyway, let's not let that detract from the beauty of the universe.

Re: APOD

TheGreatAndPowerfulOz21-Jan-16 5:38

TheGreatAndPowerfulOz

21-Jan-16 5:38

Dang! I thought I was running my lightship in stealth mode! And the ionic drive must be on the fritz. Damn!

In other news, awesome picture!

Decrease the belief in God, and you increase the numbers of those who wish to play at being God by being “society’s supervisors,” who deny the existence of divine standards, but are very serious about imposing their own standards on society.-Neal A. Maxwell
You must accept 1 of 2 basic premises: Either we are alone in the universe or we are not alone. Either way, the implications are staggering!-Wernher von Braun

Thought of the day

OriginalGriff21-Jan-16 5:01

OriginalGriff

21-Jan-16 5:01

If a redhead gets a job as a baker, does that make him a ginger bread man?

Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...

Re: Thought of the day

jeron121-Jan-16 5:05

jeron1

21-Jan-16 5:05

That makes him a drummer.

"the debugger doesn't tell me anything because this code compiles just fine" - random QA comment
"Facebook is where you tell lies to your friends. Twitter is where you tell the truth to strangers." - chriselst
"I don't drink any more... then again, I don't drink any less." - Mike Mullikins uncle

Re: Thought of the day

H.Brydon21-Jan-16 7:11

H.Brydon

21-Jan-16 7:11

That was pretty funny. I liked that one. +5 for you...

I'm retired. There's a nap for that...
- Harvey

Re: Thought of the day

jeron121-Jan-16 7:54

jeron1

21-Jan-16 7:54

I was wondering who would get the reference. Smile | :)

Re: Thought of the day

HobbyProggy21-Jan-16 5:08

HobbyProggy

21-Jan-16 5:08

As long as i don't have to put my bacon on a ginger beard then everythings fine Big Grin | :-D

Rules for the FOSW ![^]

if(this.signature != "")
{
    MessageBox.Show("This is my signature: " + Environment.NewLine + signature);
}
else
{
    MessageBox.Show("404-Signature not found");
}

Re: Thought of the day

den2k8821-Jan-16 5:22

den2k88

21-Jan-16 5:22

If a (female) redhead gets a job as a baker I'd buy several kilograms of bread every day. One loaf each time.

GCS d--- s-/++ a- C++++ U+++ P- L- E-- W++ N++ o+ K- w+++ O? M-- V? PS+ PE- Y+ PGP t++ 5? X R++ tv-- b+ DI+++ D++ G e++>+++ h--- ++>+++ y+++* Weapons extension: ma- k++ F+2 X

If you think 'goto' is evil, try writing an Assembly program without JMP. -- TNCaver

"When you have eliminated the JavaScript, whatever remains must be an empty page." -- Mike Hankey

"just eat it, eat it"."They're out to mold, better eat while you can" -- HobbyProggy

Re: Thought of the day

Corporal Agarn21-Jan-16 5:32

Corporal Agarn

21-Jan-16 5:32

Oh, snap![^]

Mongo: Mongo only pawn... in game of life.

Re: Thought of the day

OriginalGriff21-Jan-16 5:42

OriginalGriff

21-Jan-16 5:42

Oh, dribble![^]

Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...

Re: Thought of the day

Richard Deeming21-Jan-16 6:10

Richard Deeming

21-Jan-16 6:10

An excellent film[^]! Smile | :)

"These people looked deep within my soul and assigned me a number based on the order in which I joined."
- Homer

Re: Thought of the day

Corporal Agarn21-Jan-16 6:21

Corporal Agarn

21-Jan-16 6:21

Forgot about that one. (Never saw it)

Mongo: Mongo only pawn... in game of life.

Re: Thought of the day

Daniel Pfeffer21-Jan-16 6:13

Daniel Pfeffer

21-Jan-16 6:13

And does learning to bake cookies make a girl scout a brownie? Smile | :)

If you have an important point to make, don't try to be subtle or clever. Use a pile driver. Hit the point once. Then come back and hit it again. Then hit it a third time - a tremendous whack.

--Winston Churchill

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.

Welcome to the Lounge