Tags » Source Control

How to resolve conflicts in git by enforcing the local or the remote changes?

It happens in rare cases that either the remote or the local repository is out of date compared to the other and the fast forwarding merge wouldn’t work any more. 70 more words

Web Development

Transferring a Bitbucket Repository

I recently needed to move control of a source control repository on Bitbucket from a personal account to a company account. Fortunately, there’s a relatively easy built-in process to transfer it between accounts. 224 more words

XPages

Microsoft Visual Studio, TFS & Source Control

This post shows you how to use Microsoft Team Foundation Server (TFS) Source Control with Visual Studio.

Here is a link to my Microsoft Visual Studio, TFS & Source Control… 8 more words

Microsoft

IDE-Integrated Git Source Control

It was merged just yesterday. When Rubberduck 2.0 is released, VBA devs will have a new tool in their arsenal: full-fledged Git source control, seamlessly integrated into their IDE, in a dockable toolwindow: 306 more words

Vba

Copying property definitions for custom controls in #XPages

Sometimes, when I’m working on my applications, I’ll decide that I want to copy a property definition from one custom control to another. When using the standard properties interface, it’s a lot of work. 428 more words

Xpages

Why you should use Git over TFS

I have been an advocate of git for long time now and I might be biased a little bit, but take a moment to read this and judge for yourself whether git is the way to go or not. 737 more words

Application Development And Integration

git alias

If you’re not using git as your source controller, you’re missing out.

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

353 more words