K
K
koltyrin_logan_stalker2018-08-08 09:34:16
Java
koltyrin_logan_stalker, 2018-08-08 09:34:16

Am I dumb or is this how it should be with bitbucket?

The essence of the problem. I have a repository on bitbucket with an android application project. Everything with him was great, everything was cool. I started a separate branch, made changes, pushed everything on bitbucket several times and one day I decided to merge the branches (the main master and the new current_version). In git, I only know the basic commands and principles, and I have not worked with branches before. But I have an idea what should be after the merger. In general, I googled on the Internet that and how I did the merge in android studio - switched to master, then selected the current_version branch and select merge in its menu. Actually, the studio did not swear at anything, and in the wizard the project structure changed to the same as in current_version. There were no differences between them anymore, I made sure of this and made a push to the bitbucket server.
And this is where mysticism, incomprehensible to me, began. In general, I go to the bitbucket repository, I press the "<> Code" button, I go to the folder with the java files iii ... there is the old project structure. That is, the files common to both branches were updated to the latest changes, but no new files, new folders were added, and moreover, the old files that had already been removed from the project remained, but were not available. At the same time, if you go to the "changes" section and select the last commit, then all the current changes can be seen in its resources. When cloning a project, the current project structure is also saved (I cloned and opened the clone in the studio, everything is as it should be there). But in the bitbucket repository in the "code" section for some reason it does not show all the current changes.
I tried the same trick in another python project and everything was done as it should be, including in the repository on the site in the "code" section, all changes are displayed in full.
In a panic and misunderstanding (I googled the problem, but didn’t google anything, and I don’t even know how to google it, because there is some kind of garbage and there are no clues, plus I’m in a panic), I deleted .git from the project, deleted the repository on the site, again recreated the repository on the site, cloned it, threw the project files into the freshly cloned local repository, added the files to the git "git add ." , then committed and pushed. As a result, the same garbage is observed even after such manipulations. At the same time, there is only one branch in the project - the master.
By the way, there was a branch earlier, and at the time master was merged with current_version, it was also there, but in it ... there seemed to be no changes, and even if there were, it can’t affect what is happening in any way, because both branches were forked from the master.
In short, guys, help the dumb one if you have any ideas? =) Or leave everything like that?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
M
Mikhail Chvarkov, 2018-08-08
@KuSu

As I understand it, since the last commit was not on the server, it did not freeze in the master. Here you are in the code section and show the "old" code. Try to freeze again after pushing.
And I would also suggest putting a source tree and looking at the structure of branches and commits in it. It's all clear enough.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question