Questions tagged [rebasing]

23 questions
0
votes
4 answers

Theme Image URL Rebasing asp.net

I am implementing themes to enable an existing website to be rebranded (logos, colors, images etc.) depending on the requesting URL. I understand how to do that and have got the skins working fine except for some exceptions related to the URLs of…
daveywc
  • 3,136
  • 7
  • 45
  • 58
0
votes
2 answers

How do you rebase hyperlinks and content in an ASP.NET page?

I have an ASP.NET page to handle "404 page not found" it's setup by configuring the section in my web.config file and setting the custom error page for 404 errors in IIS manager. It works as expected for pages in the root of my…
Alex
  • 2,815
  • 2
  • 24
  • 22
0
votes
0 answers

Calculating growth index of stock performance which is reseted every four years

I am analysing a stock-index in 4-year cycles and would like to start with a base of 1 at the beginning of the first year and the calculate the returns on top, so that I get a column in the dataframe that goes 1, 1.02, 1.03, 1.025... The return…
Markus W
  • 1,451
  • 5
  • 19
  • 32
0
votes
2 answers

Rebasing to remove parallel history and create a single linear history

I created a feature branch from master branch. After that there is a commit [F1] from feature branch. [F1] -- Feature Branch / [M1]-[M2] -- Master Branch After that, feature branch is merged in master branch,…
arthur.afarias
  • 140
  • 1
  • 9
0
votes
0 answers

Git rebase origin/develop for feature-2, which is branched off of feature-1, and feature-1 was originally branched from develop

I have the following branch structure. o---o (develop) \ o---o---o---o (feature-1) \ o---o (feature-2) I'd like both feature-1 & feature-2, to be up to date with develop using rebase, not…
Riveascore
  • 1,724
  • 4
  • 26
  • 46
0
votes
2 answers

How can I rebase local branch into origin without merging?

I have the following case o--A--B--C <-origin/master \-D--E <-master I would like to achieve the following o--A--B--C--D--E <-origin/master and also keeping the tags at D and E. If I do a rebase then the D and E would be merged resulting D' and…
Mokus
  • 10,174
  • 18
  • 80
  • 122
0
votes
2 answers

Rebase a single commit to HEAD

I would like to rebase a given commit to be HEAD of my current branch. Of course I can use git rebase -i ~ and then move it down to HEAD (as described in this question), but I want to automate this process. Is there a neat way to…
Wilder
  • 181
  • 5
-1
votes
1 answer

How much should I rebase interactively?

I would like to translate a larger book hosted at Github. The orignal repo would be forked by me and I'll usually do my work on my own at a new branch. So nobody would really care about a changed history while rebasing interactively. Sometimes a lot…
user3147268
  • 1,814
  • 7
  • 26
  • 39
1
2