Re: Rebase problems

From: Andreas Schwab <schwab@linux-m68k.org>
Date: Nov 8, 2010, 19:30 UTC
Message-ID: <m2vd47iper.fsf@igel.home>
In-Reply-To: <loom.20101108T190513-206@post.gmane.org>

Maaartin <grajcar1@seznam.cz> writes:

Show 8 quoted lines

> There's a file containing the timestamp which gets compiled in, so the 
> executable can show it's version. Sometimes, I need to set it couple of times a 
> day, sometimes only once a week. For each such timestamp I create a tag, so I 
> can track it to the source easily. The timestamp is an important piece of 
> information, so I put the containing file under version control. The downside is 
> that I often get a conflict in this file halting my rebase. Is there a way how 
> to ignore or automatically resolve all conflicts in this file (any resolution 
> strategy is fine, as it will be overwritten anyway).

If you already have a tag for every timestamp, why not autogenerate the timestamp from the tag?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."