How to handle the conflicts of git

Starting...

This lab is to help students to solve the conflicts of merging their branch to master. So, following the instruction, I created two issues which are about Create a filter for status code and Use color flag to use color output. Both of issues came from same commit position from master.

Progressing...

The first step I took is I added the new feature and commit and merge to master branch. From this OSD600 course, I have learned new library, Yargs, from the lecture video, and a lot of classmates already used it. Hm, I am a slow-starter LOL. Anyway, after applying the library and little bit of code change, I merged to master branch and there was no problems. By the way, following my professor's instruction, I tried to use

providing code to blogger, gist to avoid using just image.

And this is my first merge result.

Next, I moved the issue-8, which is about color option from Node environment. To make the test easier, I used dotenv library. However, in this time that I tried to merge to master, I got the conflicts.

To conflict this issues, I need check what files had the issues. Thank vs-code, it provides which files had the issues. So, after I fixed the issues, I tried to merge again and finally I got it successfully.

Concluding...

It was not easy actually. I had to modify a lot of parts and test it again and again. I can expect now that in the real world, I will handle with a lot conflicts from other co-workers since there are more than two issues...

Comments

Working with telescope

Starting... This lab is to help students to communicate with a big project, telescope, and understanding how to handle with the set it up. There were a lot of trouble since many of technologies are new for me such as docker, docker-compose, elastic search ladis, pino, and so on. Let's jump in the big project . Progressing... The first step I took is to install wsl 2. It is not very difficult since microsoft provides good instruction, link . Although the telescope provides very good instruction, here , It was not really easy for me to get a concept and set it up successfully. Therefore, I needed to ask a lot of questions on slack, telescope channel. Some helped me a lot and explained so much and finally I got it work successfully. After my server was working locally, I didn't have any issue to get the response from the url, http://localhost:3000/posts. To communicate with the local server, actually I needed to change my code a lot since I wanted to sp...

Getting more difficult?

Release 0.2.4 Now I am at almost the end of release 0.2 and I chose the telescope as the final contribution. To be honest, this is huge, well organized and great project and it is first time to take a look. Unlike my previous assignment during the previous terms, there are tons of what I have never seen. First, docker compose is great and the document for contribution is very clear. Of course, I had no idea when read it first, but every time as my professor mentioned, there was a great guy, helper?, helping me a lot to set up the project. Although I had no idea about Elastic-search and Redis-cache server, I was happy to take a time to look though the codes and to understand. Again, trying to understand an issue is always hard for me and sometimes I am really not happy when somebody does not understand my question. This happened again. The reason why I attached the picture is that I am still confused about the whole process of this project especially about why frontend didn't get ...

Elastic search and more

Release 0.3.1 Now it is time to learn what is Elastic search since the chosen issue is about adding more fields for our model in telescope. This is very new for me so I was very scared when I started to work for this but now I think I am more confident. First, Elastic search is such a great supportive database especially for index search. The good thing is that it is not only the index search for whole value but, partial keyword as well. Of course, it may be wrong since I also just started to study it. Anyway, It was very careful when I read codes one line by one. Following the official document , I tried to add some fields, but it made some test failed so I needed to fix them. The below content is from the official document: Mapping edit Mapping is the process of defining how a document, and the fields it contains, are stored and indexed. For instance, use mappings to define: which string fields should be treated as full text fields. which fields contain numbers, dat...

Stella's Blog

Search This Blog